Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Jun 2011 18:58:22 +0000 (11:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Jun 2011 18:58:22 +0000 (11:58 -0700)
commit33e4fc801e0833420e4da091a2bf92584ad22a93
tree131e161f6c590f120d08bd8322cb78ed0f0f4a7c
parentb14ca77cac3bcfb8eccc60657d99f30b43bca795
parentb4d889225478365dea420cef5220ca44a4884e38
Merge from trunk.